Normalise names of test util functions