updated test routines