Follow up to fix more tests in OrderEntryIntegrationTest and OrderTest - TRUNK-4202