Modify test class (again) to fix cross-version compatibility  (hopefully)