Added test datasets
merge fixes