test fixes, and entity finder refactor swc-458