Fixed DB queries test not working under upstream