Fixed (most) failed tests