Updated unit tests - tasks are now fully tested