Decouple unit test some more.