Fix tests that rely on replica type