revamp hwacha tests