Corrected some mocks issues.