Merge "POM changes to centralize test scope deps"