Refactored the close approach, wrote more tests, and especially tests for SearchSourceDataSet.