Cleaning up test code, renaming nested test classes to reflect Framework changes. Implementing R# suggestions.
Merge branch 'feature-jo-test-cleanup' into develop