Test Class Fix