refactored FireTest