Updated simulator tests

Re: #69, I'd like to do unit tests this way instead... what do you think? I'm still in the process of upgrading the rest of the tests, but the sooner I can get feedback the better.