Merge "Split up ServerActionsTestJSON for better mixing"