adjustments for test in native env