Fixed and updated FBTest for issue 1461