Cleanup: removed RESULT_GROUP and testing code