Refactoring
Writing ordinal into zk
Test case correction and changes to Visibility CP