Enhancement(e2e): additional e2e tests
Merge pull request #1622 from PaulL1/more_e2e_tests

Enhancement(e2e): additional e2e tests