Move some tests, beef up Mocks.cs.