updated testing part