Corrected some misteks, another 20 failed tests to adjust.