.
Major cleanup of test routines
cleanup of xtemp
Added headers only