Small fixes to use mockup objects. Added full minidiff mockup