Extend automated Unit Test coverage to 100%