revamped testing structure