Merge pull request #57 from alainmarcel/alainmarcel-patch-1

Tests refactoring