Corrections & testing