Revised Testing - Improved Plotting