Enhance group tests

This increased overall coverage by 3%!