Updated testing framework