remove TODO items from query_test