Adding better scoring tests