fixes to fbtest