Fix broken unit test.
Wholesale divesting of code not center to core compentency.