write several tests
rearrange methods
add several testcases