Fix s symbol to_s
Fix tests