Improve test code coverage