Require a Registry instance to be passed into Container constructor
Remove comments / old tests / TODO related to Container refactor

Questions raised in comments and TODOs will be raised in the PR.