Improve coverage to 100%