Updated test data set and updated tests within the Task set, minor changes to the task model based on Unit Tests