Merge electron and photon tests - already these were both running egamma, so this just removes the duplication. cc @fernando @thrynova @dbakshig