cleanup some bad test stuff... still working on rspec with devise