GitHub #13 - Add additional tests for full coverage