Added comments
Added tests escenarios