Merge "Add unit tests" into tm-mainline-prod