Adding rspec tests and removing not working ones