Updated testing framework stuff