Merge changes I688d84e5,Icce01201

* changes:
  Move tcu::ResultCollector to a separate file.
  Add query tests for ES31 states.