Adding argument handling to tests
Corrected tests default parameters
Results in data renamed. Minor cleanup