Fixed failing test by removing duplicate code in OrderSaveHandler - TRUNK-4302