Add additional Polish variants that fix the tests