Updated testing system