Changes and test regarding environment

Check files associated with commit