Must have been braindead doing the previous commit
Minor refactoring of cmd parameters
Fix session handling
Fix `AddAuthenticator` test and implementation