Upgrade scalatest to 2.2.1 and move tests to the package directory