Adapted tests to latest modifications.