Renable skipped unit tests by removing grammar mock calls