added some queries to test12. same switch as for test8 needed