Fixed adapter tests and generate availableOptions merging