Tweaks for testing with user-supplied lb_id