Uvs ready to be merge

While you are in there, maybe right some unit tests for these ...