Fix to_s and pass tests