[FOLD] Tidy up speed and logging
[FOLD] Refine unit tests