Added URI data type, better factoring for header heuristic tests