Fix for manual plot tests - further fixes to ensure all plots work as intended.