Updated testing scripts