Improve tests for task