Updated testing module