New Specs2, sorted out deprecation problems