Fixed graceful stop in sim controller, added tests
Merge branch 'master' of https://github.com/dndodson/cs6310-project3