Updated a couple of unit tests. I'm sure there are a few more.