Fixed up Task and TaskTest