Better testing, 92% coverage.