split out S-mode tests and M-mode tests