added some test wrap and other old stuff