Merge "Change a test to be robust to env." into pie-cts-dev