I think I slightly improved the test. I'm not sure how some of the string stuff works.
I got AddProductGroupController working, but it did take a couple of hacks.