GitHub #20 - Add tests for full coverage