Fix some tests that were failing due to mocks.