Add navigational controls and tests