Updated testing tools