Fixed tests with new DataWrapper