Merge "Consolidate testing for input changes" into tm-dev