Update HTMLBars and get tests passing