Fixed couple of rubocop issues
Fixed a test with the changed model