Improve test coverage a bit