Merge "Move snapuserd_test to general-tests" into main