Improve the test coverage