Removed a test, fixed some logging.