Fix tests due to version conflicts