More tests
Merged SRD and PlotSRD
minor names changes