Fixed test data + structure links