Increased test coverage back to 100%