REVIEW-2715 - test class rename.
REVIEW-2715 - spockify tests.