Tweaking tests & new plot function.