Fix CustomGroupTest
Code cleanup