KAA-237: Additional tests