Improving the data argument tests