Support context blocks
Small t for consistency
Create and delete messages with tests