Move tests to the proper files, streamline test names and remove duplicates.
Mixed types have been removed from MSC1767.
According to MSC3552