Refactor the task tests, add runner tests, work on runner