Refactor navigation concern

the point of a named subject (`subject(:subject_name) { Foo.new }`) is that you then don't need to use `subject` anywhere in your specs, as it doesn't have a specific enough meaning