Merge "Update test names to kotlin style" into tm-dev