Fix the broken/skipped tests.