Modified tpch queries to correct tpch queries from dev unit tests