more tests + code coverage.