test Fire
refactor tests