WIP
Refactor test code to mimic Rails syntax