I would prefer to have this under test before it gets merged in. If you would prefer, you could do the spec test cleanup first and we could merge that in, then you could add tests for this on top of the spec test cleanup PR.