Updated models, admin, tests w/ rough attempt at modeling US health plan vagaries