correct typo
add task
rearrange order
add task
add other fields as TODO
refactor helper tests
refactor tests (again)