test refactor
add more tests