Add ResultSetGrouped, refactor ResultSetSimple, and test