Adding some more OCL Macros + coverage