improve self test capability