Add test for data(option)
Update data tests in light of data removal being moved to remove method