Refactor Test