Updated testing: