Fix tests based on changes in 0f4bc854