remove rspec expectation warnings and old should syntax