Added scenario builder tests