Merge "Remove unused test mapping file"