Updated testing class