Scala211 upgrades

These are not Predef asserts, they are scalatest ones, which are all sorts of awesome