Add more @group tags to test files to make it easier to isolate tests