modify testing structure