Changed names of distributions and started on tests