Changed to match old toStringInternal
Updated tests to match new format