Added more task tests