more tuning for test infrastructure