Fix tests after merging ufo-core restructuring