Added validations, need to change rspec tests to work with them - CP