Update test framework to include queries with duplicate alias