Initial commit of Test environment changes