Add remove-task-reload test and fixes