bugfix for cyclic import in units
small update to fix bonsai test