Fix the testsuite after the merge of the reactive branch