Refactor for make great benefit unit testing