Additional DataFindRequest unit tests and test cleanup