Tidied up valid message type assertions and removed some hacky not-quite-settings-that-are-advertised-as-settings types.
Tidied up a bunch of tests.