Trying to make test data more reliable.