replacing existing code with modified classes
Fixed bugs in code relating to order of RNG calls
Added new tests to several methods