More string testing/fixes