Update file names
Update test code for each MTA and MSP module