Fix careless mistakes
Add test for UxU