Fixed some tests that failed to build using Scala 2.10.4.