Improved Code Coverage of Tests