Merge "Bring in tests against spice console" into mcp/caracal