Fixing test fallout unfortunately requires more work, we need to do it, but let's merge something at least!