Add more tests, boost coverage.