Add a few more tests, improve coverage