Merge "Add tests for server actions"