restruct test
add test
support comments