Code review update

* Fix not needed variable
* Omit groups when needed
* Fix test registration_complete factory
* Clarify docstrings
* Removed unused mentor
* Revert removed test with future TODO not