The tests for 2.0 are a bit messy. There's duplication in several places and I think that we can do something clevererer with mocking,