Add navigation through provider
Fix test