Test simplification following review