reorganizes WakkaClassTest; groups Query tests into own section