Merge "Fix APCT tests"