Fix up synchrotest a little more