Improve test coverage

More tests.