This fixes problems in testing while maintaining backwards compatibility. Allows upgrade of zuul to 1.3.1
