FBTest: backport modified test from 1.12