More tests and fixes
MessageStackTest and associated fixes