Fix Vanilla tests