Testing and corrections