Working on new rspec. some of them are currently broken