Commented out unused logging.
Commented out some features of a test function.
Merge from master.