Add test coverage
Merge pull request #367 from SBoudrias/coverage

Add test coverage