Merge "Update the test directory structure" into tm-dev