Merge "tests: Allow string to be passed to getTestUser() etc."