Revised Testing - Improved Plotting
Improvements to plotting
Merge branch 'develop'