extended_path: update tests models; correct bugs introduced in
previous commit