Resolve test warnings

Signed-off-by: Phill Sparks <phill@crowdlab.com>
Merge pull request #316 from crowdlab-uk/feature/rails4-test

Resolve test warnings for Rails 4
Merge branch 'master' into develop