[DELTA-1452] refactored to reduce nesting
[DELTA-1452] adding additional context to test names
Merge pull request #23 from BancVue/DELTA-1452_refactor_reduce_nested_blocks

[DELTA-1452] refactored to reduce nesting