Merge "Adjust APF interpreter tests to match APFv4" into pi-dev