Updated for specs2 and scalaz