Add null checks
Modify tests to use one web socket connection
Fix shim in main-test.js, run tests after timeout
Merge pull request #64 from mlolson/fix-bugs

Fix simulation tests