Merge "Updates tests due to dmaap adapter changes"