Update desired caps

And extract out so less repetition between tests.