Cleaned up test-utf8-body a bit.