Improve Coverage Test Cases