Merge "Added a unit test for TaskPersister" into nyc-dev