Improve engines test coverage