Increased test coverage to 100%