test cleanups - make survey test good template, enotice compliance