Updated test routines. No functional change intended