Updated testing behavior