FLUID-4907: Clean up code and fix all UIO unit tests.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907