[bug973945] - refactored firehouse and test as well