minor changes for test_sarwind