Test class refactored.