refactor tests
refactor tests