Adjusted test suites to be valid with rspec3