Replace two long running integration tests with unit tests.