Merging tests environment changes from bootstrap-improvement branch.