More spec fixes to support non-nested nav