more adjustments for testing env