Merge "[mtectrl] Move TEST_MAPPING to correct directory"