Adding more unit tests and tests for TaskRunner