Adapt tests to new core fixtures