Merge "Fix assumption that userId must be 0 in several tests" into main