Test coverage back to 100%