cleaned up group queries and set up unit tests