Increased test coverage
Merge pull request #4 from lricoy/tests

Increased test coverage