Added concern for token generation
Added database cleaner statements to before actions on failing tests.  All tests now passing