Merge branch 'test-exceptions'

SCXML-284: Clear up exception handling in tests
This closes #4 from github. Thanks to Allon Mureinik.