more tests, better coverage