Updates

reverted navigation to navigation2
made tests for identification, collection, and identification/collection
etc