Minor code cleanup, restore the logging level hack in TestHive.scala