Close #3 - Additional tests for full coverage