adapted tests for latest changes