Merge "Add unit tests for test class fixtures"