modified for newtest case