Add missing test that fails if run through the full suite
Add another fix