Moved to patched doubleshot and got tests running