Test coverage at 92%