This parsing of navlinks for some entities is inconsistent and the tests don't catch this. Add more tests and refactor the parsing code.