Refactor path and recover lost tests