fixed repos to add ability to accept an engine, and fixed tests