clean up EngineTest class
..