Merge "Fix a few tests" into tm-dev