Update test to be more similr to fbbase-test