Improve test units code coverage