Improve engine
Add tests
Run tests by default
Add tests