Reorganised finder specs