chapter 6 added test for uniform distribution
resolved merge conflicts