[Issue #87] Updated test data to reflect new structure