[PATCH conductor 2/2] Fix the tests