Adjust tests for Multisuite.