TST+BF: Improve DataFinder tests, fix issue with unpack_single and sorti...

...ng