Adapted tests to recent changes.