-Refactor test