Cleanup UnitSpec.scala