APIC test fixes