Merge "Cleanup TaskParseTestCase unit tests"