Refactoring steps, removing deprecation, adding recent check to navigation test