Fixing my test cases and... oh magic! the tests now pass... well done @sgiehl