All tests but toString pass now