Improve data tests