Updated the test to fix the broken test
Updated the test to reflect the backward-compatibility breaker
Updated the ORM to use the new Query engine