Refactoring: Divided in two set of tests