Make tests more individual