Tweak the test data code