Some reorganization with delays and also making the baseline.R compatible with delay.R
See testing-delay.R and testing-baseline.R