Adapt tests to new dataset