Move test routines into same directory as main code