Fix tests with the 2.11 branch of the Scala compiler