finally got some engine tests to pass