Revert "Fixed all tests and code to pass after prior modifications"

This reverts commit 79a94a88e947cc73762fae92e546a83da0249c55.
Final commit.  The app broke once I added Paperclip and destroyed an instance.