Adjust test env for extra tests