I’ve had a fix and refactor for this for a couple days in my repo, but finally got around to creating a PR to this one. sorry i know it’s already Jan 1st. lol 
https://github.com/MeghnaAJ/discourse-fireworks/pull/4
not sure about the acceptance tests though 