Making log file the "name of the test".log
Minor cleanup