Add engine-related tests
Cleanup tests
Fix tests to actually work
This is the exact reason why you write tests...