more tests, 83% coverage