Add apc to speed-up tests