Fix manualmode tests

Hopefully...

I suspect the weird behavior we are seeing is somehow related to the 2nd commit here.