add more engine tests
Test improvements