Added missing manage_name_id methods and fixed references
Added a couple of tests