repaired unit and e2e tests
Merge pull request #6 from andy-b-84/master

fix: unit and e2e tests are now working