updated testing structure