Add more tests to ensure MSTD works.

Also changed how MSTDS work.