Fix should version breakage in test/surveys