Unit Test : code refactor.