example updates in order to make test-suite work