adjust structure
add scalatest