Rebasing TestClaw