refactor tests
refactor