Some edits to tests to make them run in a timely manner, but I can't track down why the test_mcmc.py test is taking so damn long to run.