All tests are passing again, but am now using HTMLBars.