remove needless tests
refactor tests