increase test coverage: 90% lines, 95% funcs