Ucare fixes and tests