Naive string->string rewrite and refactored tests