fix RUnits, broken tests