In case we really do this for 2.0.0 (March 2016), I think we need some mocks from Andres Galante