remove unused codes
refine test descriptions