Updated all tests to use Engine class.