Tweaks to include test periods
Allow command line index