before_save and rspec fixes