rework of test behaviour