ncm-accounts: Fixes for existing unit tests to make them compatible with last changes