Refactor tests
Refactor tests