simplified finder matching
added Splitter & crudy tests