DMAAP-MR Unit test improvements