udpated testing