I ran into a research paper on measuring capacitors using a VNA that might be of interest. It analyzes capacitance and ESR accuracy for the S11 reflection, S21 series-through, and S21 shunt-through measurement methods. The paper covers connector parasitics and fixture deembedding. Lots of useful graphs.
Brian
