Reflect the evolution of environment.
Merge pull request #101 from jmpascal/master

Reflect the evolution of test environment.