+ Prep for unit test consolidation consistent with other modules NOTE: HBtest and MMtest appear to be stale tests and are not built using the scons system. They have been removed.