Merge "Delete outdated tests" into tm-dev