Allow test-support and rest to use the same version of when