Updated testing queries