A bunch of changes to test routines