Improve Code Coverage