+ tests, 86% coverage