Removed unused imports; fixed scalatest