Refactor to improve code coverage

Commented out and/or reorganized some code flow to remove code paths
in the simulator which aren't hit when running ARMv6-M tests.