CK-13340: Adding unit tests