Added client-side file combination tests