Added tests. Minor modification to the TaskModel for formatting.