Fixing tests for now

But this is just a workaround, it will break again once we go v5