Remove stale class.
Added test case for combining two queries.