Adding more tests and cleaning up the task.