Fixing MockData behavior