Adding the abiliy to automatically generate plots, and two more test cases