Made rspec tests work with validations. Added post rspec test - CP
Refactered models - CP