Eliminated utest workarounds.

Now that it's not relying on String augmentation.