Add special code for epiquery for testing