Correction + tests