Merge changes Ifc7e4d86,I4ef9abad into sc-dev

* changes:
  Rename Stack to Task related terms in tests
  Merge some unit test classes