updated testing framework