Improved testing and navi now uses intents.