fixed package & added e2e tests