Added very simple FW test
Added better path rebuilding logic