adapted tests to previous changes