Remove some legacy modes from tests