NOBUG mod_surveypro: some minor fixes and hehat test