Fixing Mock recording errors