fix comment
Fix decomposable UDA test
Fix non-decomposable UDA test