Is your feature request related to a problem? Please describe.
Pull tests from the branch "initial_test_rework" on dmesvcs to the v2 branch
Link to any relevant bugs (e.g. "Relates to bug #xxx")
Describe the solution you'd like
Ensure that all the moved test cases passes in the new branch
Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.
Additional context
Add any other context or screenshots about the feature request here.