Refactor complex tests: Classify tests to enhance their clarity and discover a TestCase break up strategy

[hemalvarambhia]

Continued to classify the methods to try to improve test clarity and see if there is a way to break a very large test case up.