Changes to provide the method name in the fail message

This change allows us to see the test that was being run at the time of
the failure. The testSuite template is changed to show both the file
that was running at the time of the failure *and* the method name (ie,
test) that was running at that time.
Merge branch 'MethodNameAdditions'