Made a few updates to the unit tests.