Added test-groupings to the test folder