Double writes for HID control, misc test changes