Nav and test changes