add more tests and fix a few minor adv nav issues

[janebitovi]

this commit was merged into staging already, just keeping develop up to date too