improved Unit Testing/Code Coverage