Merge "Use User::getId instead of trying to fix the ID in BlockTest"