FBTest enable disabled test and port couple of fixes from 1.12