fixed tests in light of last changes