Unit tests, coverage at 98%