RUBY-691 test suite refactor