COOPR-583: Fixed existing unit tests.