Refactor, Change Test