Merge "Fix focusfinder coretests"