Full fake-operational cat1 and cat2
Merge pull request #205 from reem-utils/fix_sergi

Full fake-operational cat1 and cat2