Probes removed, exception testing added.