more tests, 2 more bugs caught