Collapse all addition to the packagegroup for testing into one commit