Merge "Correct test" into tm-dev