Added more-legitimate tests + code coverage.