more robust eng fire derived parameters, added tests