added unit/e2e tests