indentation and refactor rspec tests for models