More test refactoring to enable multi users tests