Added code coverage and a couple of tests to get to 100%