Before refactoring
Renaming &  test improve