Start rewriting query tests
Add factory girl syntax methods to spec helper
Rewrite query tests (WIP)