CDK-713: This time with working tests.