Move out non-query gen tests