1 Fix and a test speed-up