Fix tests for ufo-core HEAD