uv convert unit tests and some other bits..