FLUID-4907: Clean up code and fix all UIO unit tests.