Finish upgrade to 2.11, and exec scalatest in maven build