Clean up logging and disable test by