Merge "Refactor ways of creating anonymous test user"