RUBY-660 allow aggregation helper to return cursors
RUBY-660 move version test up