Fixed bug: was using the wrong name to check presence in ids_registry
Fixed indentation
Brought spec coverage up to almost 100% (7 lines missed)