Renamed test classes for deliver and close order