Add better toString()
Fix broken test