repaired test engine (still all tests failing)