Merge "Fixes mock usage error"