[#56] added tests that weren't needlessly complicated to do without removing devise; fixed old tests just to make them pass