more tests, better code coverage