put all test generation back in