adjust few things to restore passing tests.