Changed String()
Started fixing tests.