Fixed a couple of failing tests.