@Jesper,
Another thing You might give a try with all this decoupling networks measurements might be "Analog Discovery" from Digilent, which covers frequencies from DC to 25 MHz.
Though not very clear how to perform all those low-Z load calibrations with this kit, but it has a very User-friendly SW GUI , much easier to work with.
--
Regards,
Alex