Fixed and updated FBTest for issue 654