Merge pull request #2 for engines support and tests
Cleanups for pull request #2