Fix a couple of unit tests so that the build is a little less broken.