Fix tests after core cleanup