Specs2 2.3 upgrade + shorter (simpler?) way to describe resolvers