Merge "Refactoring in test system reclass"