Changed tests to truly go off the toString method and fixed resulting failures