Fix broken tests because of version incompatibilities