more cellnav logic and tests