[BUGFIX] Repair broken unit tests