Fixing up other tests that we broke