Updated navigation tests to assure friendly forwarding