Merge "Fix test failures." into tm-dev