Fixed more navigation data tests
Fixed more navigation data tests

Rejigged some to remove setting state context directly

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation