adds tests to groupset controller
cleans up a bit