Merge "Add back UCE logic into Test App"