Merge "Some test fixes where default user is assumed to be user 0" into main