Merge "Make user authentication tests more realistic" into main