More tests fixed or disabled