Cleanup tests to work without FOSUserBundle
Merge pull request #250 from stloyd/feature/cleanup

Cleanup tests to work without FOSUserBundle