modify testing approach
add class for Data initialization