More RSpec refactoring