[PATCH] Fixes or disables failing tests.