oops, fix tests
Merge branch 'master' into resource_routes