Added Dirichlet processes and modified unit tests