Renamed test methods to conform with test guidelines