Clean-up + tests for Symplectic