Added finder system
Fix tests