Recovering EngineTests.java to enable test running.
Restored and fixed EngineTests to allow testing.