Remove duplicated features

Navigation is covered in more detail in navigation_spec.rb.
Rename and reorganise specs

So that I know what's going on in them.