CapabilitySettings minor refactor. Test improvement