Improves test handling.