Fix compile error in systems tests
Fix missing org in nav tests.