Improved plotting of test data; new test data; less debug printouts