Additional Code Coverage Added Some Clean Ups
assigned to @kraaij
merged
mentioned in commit 57f51f53