fixes failing model rspecs and some failing controller specs