RefactorToBeTestable - Fixed test + One more test