Fix Path and Tests so that CUnits Pass