Merge "Split tests out to speed it up a bit" into mcp/caracal