fixes test error and corrects small issues

So, I fixed the test that was failing (basically just an old test).  Duplication removal is excellent!

I made a few slight corrections to misc things related to testing (like requiring database cleaner) etc.

Hope this stuff helps out a bit.