Corrections & tests