Added test base for routines
Made all redesigned routines tests use the new test base