Missed it, so adding it
Rewrote engine tests
Pull request was merged in so we can now call finder methods instead of hacking it.
Test fixtures