Minor changes to the test engine