FBTest: fixes related to JSD2 adoption