+ tests, 97% coverage