More Test Corrections