Refactor RSpec tests
commit merge