EST-230: finished converting unit tests to nested static class format.