Reorg E2E test cases to reduce redundancy

[robertu7]

Description

As the test cases grow, there is much overlap among tests which slows down the test process.

Checklist

• [ ] reorg and reduce duplicate tests

Refs

• https://www.techtarget.com/searchsoftwarequality/tip/A-few-simple-strategies-to-reduce-software-test-redundancy