Add adaptive tests