Fixing a couple of test issues.