Adding in some tests for Data