Make tests compatible with CAP support