More fixes/improvements to test nav