Fix tests, because dataset modules generate slightly different SQL