Refactoring
Aceptance tests notes