starting working on automated testing
Merge pull request #1091 from jdaigneau/master

starting working on automated testing