Increased test code coverage to 100%