Add Medication fixes to fix Behat CI errors