Modular tests
Cleanup: Remove unused code for plotting