e2e tests - adding missing packages, minor cleanup