Re-adding tests accidentally commented out in 1bd26af0a55c

3 tests in CapabilitiesComparatorTest were broken by recent changes,
but I also suspect they aren't running on ci regardless of this change...

I will fix the tests and add them to ci (if they aren't already) shortly.