Cleaning up the call to plot, such that it no longer takes a redraw option. This was chosen to simplify the logic, as the same plotting window is used throughout.

Adjusting the unit tests such that they test the new combined plotting widget.