Made mock creation more error prone
Corrected testmocking
Corrected Categories
Better logging