Initial fixes of test failures [skip ci]