fixed a few spec issues

refactored the unscoped_find_by! method. removed a few instance
variables that we don't need. renamed the image fields for