Clean up source code, fix utest, fix ftest

1 job for slb/ss/authp-mt in 54 seconds