Add toString methods
Update tests