Make test data structure more clear