Updates to bring test code coverage to 100%