More tests fixed.