Add fire testing
Refactor for upstream changes