Fixed TaskTest broken tests (hopefully for real this time)