Fix: update typenames in tests.
Make capacitor simulation not order dependent.