Updated testing routines