VMWC: Testing removal of survey logic