Cleaned up logging messages and test code