Fix test setup
Move to embedded messages in games