Slightly tidy up the constraint-derivative test
Start using the new logging functions
Speed up the dynamic control test