Get rid of test query