Added toString methods and tests