Feature/implement acceptance tests

Code is quickly fix to match the acceptance case.

Deeper refactoring will come soon