Normalise company id so tests past