rearrange
test file; macro token; fix comments