#43 Final patch to get the unit tests okay.