Make tests compliant with specs (no more # in identifiers)