Improved task tests