Adding some structure for test data