queries and header tests added