more tests + coverage.