Modified tests in combined for #4032