Refactor RegisterInContext, additional test