Improve test coverage again