[PATCH conductor 0/2] A couple of test fixes