Improved the test coverage