completing the name change to 'mockery', adding some more helpers