More tests, preparing for message spec changes