Fix tests include files
Changed TestSMPPD2 to fit earlier experiments
Merge branch 'experimental'