Update test expectation failure format
Updated failing test expectations
Merge pull request #581 from alancutter/rearrangeExpectedFailures

Change expected test failures formatting