Fixing errors discovered during Unit Testing