[chore] Fixing unit and e2e tests
Merge pull request #22 from alex-deaconu/master

[chore] Fixing unit and e2e tests