S73896- adjust tests for remote environment