unit tests updated, added e2e tests