Rewrite Str container and tests