Fix tests for renamed data