Merge "Add unit tests for probing"