Changes to clean up test display and logging