One more piece of ms unit test framework still needed to be ripped out.