cache and instance tests now better prevent pollution of database
survey model tests now better prevent pollution of production db