Changed over several tests to use probes
Fixed some more tests to use probes