EST-230: converting some further unit tests to nested static classes.