Fixing errors in a couple of tests.