more tests, code coverage