Some S-mode tests really only belong in M-mode