Move exception message testing to test scenarios

This will mean that each individual incorrect message results in
its own test failure, which is a nicer failure reporting
mechanism.

Change-Id: I29d905e70a1570d65a5730d85c544b57aeab34ba