Re-structure test data description