Scala 2.10.2, and more test code