Fix navigate bug which caused a few tests to fail