Add missing tests about navigate after insertion
Code cleaning
Added missing tests for navigation + code cleanup