Minor connector tweaks, add groups (after a fashion) to the test to get it all on the page