revert to what we did last time
Merge branch 'master' of https://github.com/wei2912/bce-simulation

Conflicts:
	utils/test_sims.py
Exit if tests fail.