Test for multiple ESI vars, tweak regex