Merge "APM test: Fix default config, add test for 'dump'"