Nits, test updates, and switch set pin to opts