Fixed all test thingys