This Cleans up the code a bit and adjusts some unit tests
Merge details
assigned to @kraaij
merged
mentioned in commit b885e099