Minor changes to the logging code, as well as changes to the testing code