big FireEmitter update, added test