Removed old log messages
additional update to test and bugfix to make test pass