JayService navigational fixes
Unit tests fix