Changes to test
Refactoring some MonteCarlo functionality