Merge "Refactor DMaaP simulator and add tests."