Fix tests with DS changes